projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1693a57
)
net: e1000: Fix e1000_igb semaphore handling
author
Bernhard Messerklinger
<
[email protected]
>
Thu, 15 Feb 2018 07:55:49 +0000
(08:55 +0100)
committer
Joe Hershberger
<
[email protected]
>
Mon, 26 Feb 2018 21:51:36 +0000
(15:51 -0600)
Fix commit
f1bcad22dd19
("net: e1000: add support for writing to
EEPROM").
Signed-off-by: Bernhard Messerklinger <
[email protected]
>
Acked-by: Joe Hershberger <
[email protected]
>
drivers/net/e1000.c
patch
|
blob
|
history
diff --git
a/drivers/net/e1000.c
b/drivers/net/e1000.c
index 8316854bc17792ea59ebef738303afa0fe4b2721..5cc54efe483ad6bad71434fe42f60201cf1437ca 100644
(file)
--- a/
drivers/net/e1000.c
+++ b/
drivers/net/e1000.c
@@
-1181,7
+1181,7
@@
e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw)
return;
swsm = E1000_READ_REG(hw, SWSM);
- if (hw->mac_type == e1000_80003es2lan) {
+ if (hw->mac_type == e1000_80003es2lan
|| hw->mac_type == e1000_igb
) {
/* Release both semaphores. */
swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
} else